[JENKINS-41004] Do not report credentials with IDs masked by nearer folders #83
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…olders - Also fix a permission but where folder credentials were only available to SYSTEM and not available to authentications with USE_ITEM permission
- Added tests that show it was unnecessary, so reverting back to original behaviour as that matches more closely the System store in credentials plugin
rsandell
reviewed
Jan 25, 2017
| if (ACL.SYSTEM.equals(authentication)) { | ||
| while (itemGroup != null) { | ||
| if (itemGroup instanceof AbstractFolder) { | ||
| if (!((AbstractFolder) itemGroup).getACL().hasPermission(authentication, USE_ITEM)) { |
There was a problem hiding this comment.
Well, you just verified three lines up that authentication is equal to ACL.SYSTEM so this seems redundant to me.
|
🐛 missing test that verifies a folder credential is chosen when there is a system credential with the same id. |
jglick
approved these changes
Jan 26, 2017
| CredentialsMatchers.always())) { | ||
| if (!(c instanceof IdCredentials) || ids.add(((IdCredentials) c).getId())) { | ||
| // if IdCredentials, only add if we havent added already | ||
| // if not IdCredentials, always add |
There was a problem hiding this comment.
Are there any non-IdCredentials, really? Should we just deprecate that possibility?
There was a problem hiding this comment.
I've see one implementation - cannot recall where - so I am not going to pull the plug on them until I have the implementation guidelines written and published
| } | ||
| } | ||
| if (itemGroup instanceof Item) { | ||
| itemGroup = Item.class.cast(itemGroup).getParent(); |
There was a problem hiding this comment.
itemGroup = ((Item) itemGroup).getParent();- Also need to bump credentials plugin to 2.1.11 to ensure that the stores are identified in the correct sequence
|
@rsandell we should be good now! (assuming the CI server agrees) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See JENKINS-41044
Relates to jenkinsci/credentials-plugin#77
@reviewbybees